Merge from emacs-23; up to r100473.
authorGlenn Morris <rgm@gnu.org>
Wed, 16 Feb 2011 08:39:19 +0000 (00:39 -0800)
committerGlenn Morris <rgm@gnu.org>
Wed, 16 Feb 2011 08:39:19 +0000 (00:39 -0800)
commit7a135264b2f4f34c24cb871ba0def14cb0495926
treebca0acbcf6a8b9ff6812e3c266912ecf6f03b3b2
parent332e30cf578899145a0c49347499983eda99cdda
parentf95cadf8c1be33ddbb82d78dd1181cee4d92b745
Merge from emacs-23; up to r100473.
doc/misc/ChangeLog
doc/misc/dired-x.texi
src/ChangeLog
src/xdisp.c